image: Don't take icon size in set_from_definition()

diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
index 412e57cd4640c808955371939c9b420d5d7c5de2..a224ffcfe11906837b562731296f952f913508bf 100644 (file)
--- a/gtk/gtkdnd.c
+++ b/gtk/gtkdnd.c
@@ -1588,7 +1588,7 @@ set_icon_helper (GdkDragContext     *context,
   widget = gtk_image_new ();
   gtk_widget_show (widget);
 
-  gtk_image_set_from_definition (GTK_IMAGE (widget), def, GTK_ICON_SIZE_DND);
+  gtk_image_set_from_definition (GTK_IMAGE (widget), def);
 
   gtk_drag_set_icon_widget_internal (context, widget, hot_x, hot_y, TRUE);
 }

diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c
index 734d783d23069149984620326620e3de00aa5a08..bdaac343f7ed1a78af49291537a1cc253160b260 100644 (file)
--- a/gtk/gtkimage.c
+++ b/gtk/gtkimage.c
@@ -1193,8 +1193,7 @@ gtk_image_notify_for_storage_type (GtkImage     *image,
 
 void
 gtk_image_set_from_definition (GtkImage           *image,
-                               GtkImageDefinition *def,
-                               GtkIconSize         icon_size)
+                               GtkImageDefinition *def)
 {
   GtkImagePrivate *priv = gtk_image_get_instance_private (image);
 
@@ -1211,8 +1210,6 @@ gtk_image_set_from_definition (GtkImage           *image,
       gtk_image_notify_for_storage_type (image, gtk_image_definition_get_storage_type (def));
     }
 
-  _gtk_icon_helper_set_icon_size (&priv->icon_helper, icon_size);
-  
   g_object_thaw_notify (G_OBJECT (image));
 }
 

diff --git a/gtk/gtkimageprivate.h b/gtk/gtkimageprivate.h
index 0424fcd93a2cbd456e5f6f6eb961cc9a8bcf2fd5..58b1804c66e17411154a460b31255a3173b46d0d 100644 (file)
--- a/gtk/gtkimageprivate.h
+++ b/gtk/gtkimageprivate.h
@@ -33,8 +33,7 @@
 G_BEGIN_DECLS
 
 void            gtk_image_set_from_definition           (GtkImage               *image,
-                                                         GtkImageDefinition     *def,
-                                                         GtkIconSize             size);
+                                                         GtkImageDefinition     *def);
 
 
 GtkImageDefinition * gtk_image_get_definition           (GtkImage *image);